merge with xen-unstable.hg
authorIsaku Yamahata <yamahata@valinux.co.jp>
Wed, 22 Oct 2008 02:46:55 +0000 (11:46 +0900)
committerIsaku Yamahata <yamahata@valinux.co.jp>
Wed, 22 Oct 2008 02:46:55 +0000 (11:46 +0900)

Trivial merge